Fixes for the RP1 clock driver in 6.18#7183
Merged
pelwell merged 5 commits intoraspberrypi:rpi-6.18.yfrom Dec 18, 2025
Merged
Conversation
…rror Connect PLL_AUDIO_SEC to CLK_AUDIO_OUT, which had been commented out to avoid interference with I2S: we expect them never to be enabled at the same time. Work around a rounding error that occurs when the desired rate is exactly the max but not exactly achievable by the PLL. Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
PLL dividers are registered using the clk_hw in the clk_divider member of rp1_clk_desc, rather than the direct clk_hw member. In order for parent location to work, parent declarations must link to &<clock>.div.hw, not &<clock>.hw. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
In fact the register field has 6 bits, but we only ever set it to unity. Due to a typo we were setting it to BIT(1) == 2, causing PLLs to run at half the desired rate. Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
The determine_rate member of clk_ops returns the rate to the caller by modifying the pass-by-reference req structure. Its actual return value is a status code. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jan 5, 2026
kernel: Fixes for the RP1 clock driver in 6.18 See: raspberrypi/linux#7183
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Jan 5, 2026
kernel: Fixes for the RP1 clock driver in 6.18 See: raspberrypi/linux#7183
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See #7179 for the problems and discussion.